bitkeeper revision 1.593 (3fb0d1ceZM5ys4sxO5836gfzMM0V9Q)

string.c:
  Always include a memcpy function in Xen, for weird gcc configs.

diff --git a/xen/common/string.c b/xen/common/string.c
index 2ff4efc4264d8e64fb91dd31fad66da37d24d6f9..2a8bb6681599e78a49c4418904ed3dfd021e4eb9 100644 (file)
--- a/xen/common/string.c
+++ b/xen/common/string.c
@@ -391,7 +391,6 @@ char * bcopy(const char * src, char * dest, int count)
 }
 #endif
 
-#ifndef __HAVE_ARCH_MEMCPY
 /**
  * memcpy - Copy one area of memory to another
  * @dest: Where to copy to
@@ -401,6 +400,7 @@ char * bcopy(const char * src, char * dest, int count)
  * You should not use this function to access IO space, use memcpy_toio()
  * or memcpy_fromio() instead.
  */
+#undef memcpy
 void * memcpy(void * dest,const void *src,size_t count)
 {
        char *tmp = (char *) dest, *s = (char *) src;
@@ -410,7 +410,6 @@ void * memcpy(void * dest,const void *src,size_t count)
 
        return dest;
 }
-#endif
 
 #ifndef __HAVE_ARCH_MEMMOVE
 /**